ignrando: drop straydebugging.

xmlgeneric: pass qstrings all the way through
cet_util: don't molest rte_name, rte_desc with potential double encodings.

diff --git a/gpsbabel/cet_util.cc b/gpsbabel/cet_util.cc
index c2b8274c46ef1ea67dc8542379b9aff0a85d9b88..3994cb885587c81513fc8a168fd6a74e05caa172 100644 (file)
--- a/gpsbabel/cet_util.cc
+++ b/gpsbabel/cet_util.cc
@@ -1032,9 +1032,13 @@ cet_convert_route_hdr(const route_head* route)
   }
 
   rte->cet_converted = 1;
-
+#if NEW_STRINGS
+//  rte->rte_name = route->rte_name;
+//  rte->rte_desc = route->rte_desc;
+#else
   rte->rte_name = cet_convert_string(CSTRc(route->rte_name));
   rte->rte_desc = cet_convert_string(CSTRc(route->rte_desc));
+#endif
   const char* rte_url = cet_convert_string(route->rte_url);
   rte->rte_url = rte_url;
   xfree(rte_url);

diff --git a/gpsbabel/ignrando.cc b/gpsbabel/ignrando.cc
index 7e9efb77de2ba47aaafa23bd0591d153507de3eb..c595cad0c5e7cbca59aacfd38b223271d05ff511 100644 (file)
--- a/gpsbabel/ignrando.cc
+++ b/gpsbabel/ignrando.cc
@@ -104,7 +104,6 @@ ignr_descr(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((track == NULL));
 #if NEW_STRINGS
-qDebug() << args;
   track->rte_desc = args;
 #else
   if ((args != NULL) && (strlen(args) > 0)) {

diff --git a/gpsbabel/xmlgeneric.cc b/gpsbabel/xmlgeneric.cc
index 205c3915ff09e52f7b1f4961771b2a57f0f4cd18..92558fe5b14112fda3af48bb7af85fef2fd6e4cd 100644 (file)
--- a/gpsbabel/xmlgeneric.cc
+++ b/gpsbabel/xmlgeneric.cc
@@ -139,7 +139,11 @@ xml_run_parser(QXmlStreamReader& reader, QString& current_tag)
         // thus we will not process the EndElement case as we will issue a readNext first.
         // does a caller ever expect to be able to use both a cb_cdata and a
         // cb_end callback?
+#if NEW_STRINGS
+        cb(c, NULL);
+#else
         cb(CSTRE(c), NULL);
+#endif
         current_tag.chop(reader.qualifiedName().length() + 1);
       }
       break;
@@ -151,7 +155,11 @@ xml_run_parser(QXmlStreamReader& reader, QString& current_tag)
 
       cb = xml_tbl_lookup(current_tag, cb_end);
       if (cb) {
+#if NEW_STRINGS
+        cb(reader.name().toString(), NULL);
+#else
         cb(CSTRE(reader.name().toString()), NULL);
+#endif
       }
       current_tag.chop(reader.qualifiedName().length() + 1);
       break;